Refactor/use modular account libs #166
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
adamegyed
approved these changes
May 10, 2024
There was a problem hiding this comment.
Looks good! Thanks for handling some of the more tedious parts of migration.
Long-term, I think we should also migrate our other git submodule dependencies (forge-std, light-account, the OZ contracts) over to NPM packages as well, but we can tackle that in a later PR.
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Motivation
This PR adds the modular-account-libs node dependency to the project, and shifts common imports to instead import from the newly added dependency, removing redundant files in the process.
This is part of an effort to consolidate dependencies into a shared source, reducing fragmentation across the modular account ecosystem.
Solution
Removes files and tests for libraries that are now imported from the dependency. These files were diff'd, and are functionally identical to the files already present in
modular-account-libs, apart from theFunctionReferenceLibwhich had slightly more functionality included in themodular-accountversion.This functionality was extracted to a new, simple library
FunctionReferenceHelpers, but I wouldn't be averse to moving them over to another file if needed. (They're only used once, so we could consider inlining them as well)TODO
Group imports by source (optional, makes import blocks more readable, i.e. Put all modular-account-libs imports in a sequence.)
Move the
LLSLRepro.t.solfile to themodular-account-libsrepo (optional, but it's the only file which imports tests, and is limited in scope to files contained in themodular-account-libsrepo)